Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 8 Aug 2007 11:27:23 +0000 (12:27 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 8 Aug 2007 11:27:23 +0000 (12:27 +0100)

Trivial merge